From: Carlos Garnacho <carlosg@gnome.org>
Date: Tue, 27 Nov 2018 13:59:09 +0000 (+0100)
Subject: main: Use StSettings instead of GtkSettings
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~897^2^2~73
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f02033acb7e80a0c4a29340c7742aedc80910ad3;p=gnome-shell.git

main: Use StSettings instead of GtkSettings

Cut a middle man by listening to dconf settings directly, and stop relying
on XSettings for it.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/317
---

diff --git a/js/ui/main.js b/js/ui/main.js
index 6e2122273..e827eb9c5 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -127,8 +127,8 @@ function start() {
 
     sessionMode = new SessionMode.SessionMode();
     sessionMode.connect('updated', _sessionUpdated);
-    Gtk.Settings.get_default().connect('notify::gtk-theme-name',
-                                       _loadDefaultStylesheet);
+
+    St.Settings.get().connect('notify::gtk-theme', _loadDefaultStylesheet);
     Gtk.IconTheme.get_default().add_resource_path('/org/gnome/shell/theme/icons');
     _initializeUI();
 
@@ -279,7 +279,7 @@ function _getDefaultStylesheet() {
 
     // Look for a high-contrast variant first when using GTK+'s HighContrast
     // theme
-    if (Gtk.Settings.get_default().gtk_theme_name == 'HighContrast')
+    if (St.Settings.get().gtk_theme == 'HighContrast')
         stylesheet = _getStylesheet(name.replace('.css', '-high-contrast.css'));
 
     if (stylesheet == null)